Merge.
authorSteven Smith <ssmith@xensource.com>
Fri, 27 Apr 2007 12:31:09 +0000 (13:31 +0100)
committerSteven Smith <ssmith@xensource.com>
Fri, 27 Apr 2007 12:31:09 +0000 (13:31 +0100)
commit04b2c0721ad5584c5bc7f4f022963dad503f3d3b
tree0af3808d4fe804d45fde22a22964d679c34c75c1
parentebd759d57e1d8e8512c020fe6d9c6b18034a852d
parent21ac7c5fddfc210136c73a54281700285dbc2ea4
Merge.